From 88444974b2d9ed3adab1a92ac407e8ac7f370b32 Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Fri, 5 Aug 2016 22:44:17 -0400
Subject: [PATCH] Combine duplicate `if` arm blocks.

---
 src/cargo/util/shell_escape.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/cargo/util/shell_escape.rs b/src/cargo/util/shell_escape.rs
index 2acbd00ea..222001706 100644
--- a/src/cargo/util/shell_escape.rs
+++ b/src/cargo/util/shell_escape.rs
@@ -12,9 +12,7 @@ use std::borrow::Cow;
 use std::env;
 
 pub fn escape(s: Cow<str>) -> Cow<str> {
-    if cfg!(unix) {
-        unix::escape(s)
-    } else if env::var("MSYSTEM").is_ok() {
+    if cfg!(unix) || env::var("MSYSTEM").is_ok() {
         unix::escape(s)
     } else {
         windows::escape(s)
-- 
2.30.2